From c9ef67a3d6259ea87e5137b4ea7c6732bcd7c1b4 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 16 Jul 2002 17:37:14 +0000 Subject: [PATCH] (validate_interval_range, interval_of): Use string macros instead of Lisp_String fields. --- src/textprop.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/textprop.c b/src/textprop.c index 62e9446426e..84479fc39e3 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -158,17 +158,17 @@ validate_interval_range (object, begin, end, force) } else { - register struct Lisp_String *s = XSTRING (object); + int len = SCHARS (object); if (! (0 <= XINT (*begin) && XINT (*begin) <= XINT (*end) - && XINT (*end) <= s->size)) + && XINT (*end) <= len)) args_out_of_range (*begin, *end); XSETFASTINT (*begin, XFASTINT (*begin)); if (begin != end) XSETFASTINT (*end, XFASTINT (*end)); - i = s->intervals; + i = STRING_INTERVALS (object); - if (s->size == 0) + if (len == 0) return NULL_INTERVAL; searchpos = XINT (*begin); @@ -553,11 +553,9 @@ interval_of (position, object) } else { - register struct Lisp_String *s = XSTRING (object); - beg = 0; - end = s->size; - i = s->intervals; + end = SCHARS (object); + i = STRING_INTERVALS (object); } if (!(beg <= position && position <= end)) -- 2.30.2